Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 20:07:16 +0000 (13:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 20:07:16 +0000 (13:07 -0700)

Trivial merge